Merge with xenppc-unstable
authorkfraser@localhost.localdomain <kfraser@localhost.localdomain>
Wed, 13 Dec 2006 10:05:07 +0000 (10:05 +0000)
committerkfraser@localhost.localdomain <kfraser@localhost.localdomain>
Wed, 13 Dec 2006 10:05:07 +0000 (10:05 +0000)

Trivial merge